Cleaned up a little

Still not working properly