Fix PEP8 style, add sample handler