cleanup

tried to make things less retarded