Renaming + Add some style