Code clean up done. Files sorted done. Awaiting feedback from client on other services page