Cleaned up section click