Cleaned up code
Added files