Removed unused aspect and refactored other aspects