Initial Commit after cleaning