Finally cleaned up my setup