Code bashing (8/22)

Code bashing