(fix) Cleans up the code a bit