cleaned up code a bit
0.4.1