Cleaned initial commit