Finish edit profile page
Clean up code