Cleaned up some code and started RWD