Code cleanup and Start Pick Block implementation

So far, all I've done is rename things to match case conventions in places and reformat the code to be more readable. I overrided the pick block method but it still just supers the existing code.