Cleanup and adding simple @Api annotation