Code cleanup
Merge branch 'yrmt_sockets' of https://github.com/yrmt/AwesomeBall into ExpeSias