Code cleanup and simplification on Player