Removed all prototypal references, general cleanup