- Code clean up [credit: GliderPro]