Clean up code a bit; remove small bit of c&p
0.1.5