Removed spaghetti code rush