cleaned up code

This looks ok to me