cleaning code and fixing errors
lol