Fixed Angel's style issues