Code cleaning & formatting