Cleaned up PlayerModule