added quotes by id and cleaned up method names