Code bashing (7/22)

Code bashing