Cleanup code style and fix since phpDoc