cleaning up
Make things less hack-y