cleaned up code

please work please please. no story this time!