Added borderless window option, cleaned up code and naming conventions.