cleaned up code in general