Reorder methods for better organization
Clean code whitespace and remove out commented code