removed s_ and p_ prefixes, cleaned up files, reformatted files, other stuff