Code reformatting and modularity