cleaning up syntax and stuff