Clean up a bit
Add raaj's code