Fixed getting controller description, refactored a bit more