Cleaned up code
Added missing file